Merge branch 'master' into Gtk.
authorMatt Birkholz <puck@birchwood-abbey.net>
Tue, 29 Mar 2016 23:50:12 +0000 (16:50 -0700)
committerMatt Birkholz <puck@birchwood-abbey.net>
Tue, 29 Mar 2016 23:50:12 +0000 (16:50 -0700)

Trivial merge