Merge 'Gtk' into Gtk-Screen.
authorMatt Birkholz <puck@birchwood-abbey.net>
Sat, 6 Feb 2016 18:17:49 +0000 (11:17 -0700)
committerMatt Birkholz <puck@birchwood-abbey.net>
Sat, 6 Feb 2016 18:17:49 +0000 (11:17 -0700)

Trivial merge