Attempt to improve performance OSX
Merge remote-tracking branch 'origin/1.0-rc1' into 1.0-rc1