Bump version to 2.1.0-M3-SNAPSHOT
Merge branch 'origin/develop'