Merge branch 'master' into stable
Drop -SNAPSHOT for release
Merge branch 'stable'
Bump version to 1.0.7-SNAPSHOT