Merge branch 'master' into stable
drop -SNAPSHOT
Merge branch 'stable'
add -SNAPSHOT