Merge branch 'develop'
Merge 2.0.0-beta13 back to develop.