Use simple push
Merge branch 'master' into apricot
Don't float gimp
Merge branch 'master' into apricot