Merge branch 'master' into osx
Improved osx bundle
Fixed app scaling on retina displays
Merge branch '0.6.0'
Merge remote-tracking branch 'origin/osx'
Merge branch 'master' into 0.6.0