6.0-M1-SNAPSHOT
Merge branch 'master' into develop