Merge branch 'master' into Gtk.
authorMatt Birkholz <puck@birchwood-abbey.net>
Sun, 6 Jul 2014 02:56:34 +0000 (19:56 -0700)
committerMatt Birkholz <puck@birchwood-abbey.net>
Sun, 6 Jul 2014 02:56:34 +0000 (19:56 -0700)

Trivial merge