Fixup Gtk3 Gdk device handling
fix gtk2 build
Merge branch 'meta'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/ui/ui.c