Merge branch 'gtk-3-20-fixes'