Changed version to 3.1.1.beta.
Merge branch 'develop'