Merge branch 'master' into gtk3