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

Trivial merge