Merge branch 'master' into Gtk.
authorMatt Birkholz <puck@birchwood-abbey.net>
Sun, 17 Jan 2016 19:18:05 +0000 (12:18 -0700)
committerMatt Birkholz <puck@birchwood-abbey.net>
Sun, 17 Jan 2016 19:18:05 +0000 (12:18 -0700)

Trivial merge