Merge branch 'master' into Gtk.
authorMatt Birkholz <matt@birchwood-abbey.net>
Fri, 12 Aug 2016 20:20:08 +0000 (13:20 -0700)
committerMatt Birkholz <matt@birchwood-abbey.net>
Fri, 12 Aug 2016 20:20:08 +0000 (13:20 -0700)

Trivial merge