core doesn't need gtk
Merge remote-tracking branch 'upstream/master'