Merge branch 'master' into Gtk.
authorMatt Birkholz <puck@birchwood-abbey.net>
Fri, 29 Apr 2016 21:24:42 +0000 (14:24 -0700)
committerMatt Birkholz <puck@birchwood-abbey.net>
Fri, 29 Apr 2016 21:24:42 +0000 (14:24 -0700)

Trivial merge