MAVEN-53 Sync with master
Update to 6.1.1-SNAPSHOT