Merge branch 'master' into stable
drop -SNAPSHOT for release
Merge branch 'stable'
add -SNAPSHOT after release