3.0b1 - 1
Merge branch 'master' into osx-build