Merge branch 'master' into Gtk.
authorMatt Birkholz <puck@birchwood-abbey.net>
Thu, 4 Feb 2016 04:36:08 +0000 (21:36 -0700)
committerMatt Birkholz <puck@birchwood-abbey.net>
Thu, 4 Feb 2016 04:36:08 +0000 (21:36 -0700)

Trivial merge