Merge branch 'master' into stable
Drop -SNAPSHOT for release
Merge branch 'stable'