Release beta4
Merge branch 'release-3.1.0-b4'