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