small clean
Merge remote-tracking branch 'upstream/gtk3' into origin/gtk3