Merge branch 'master' into Gtk.
authorMatt Birkholz <matt@birchwood-abbey.net>
Sat, 27 Aug 2016 16:18:49 +0000 (09:18 -0700)
committerMatt Birkholz <matt@birchwood-abbey.net>
Sat, 27 Aug 2016 16:18:49 +0000 (09:18 -0700)

Trivial merge