Don't mess with dock icon (osx)
Merge branch 'master' into builds
7.234