Merge branch 'master' into stable
Drop -SNAPSHOT for release
Merge branch 'stable'
Increment version to 1.0.15-SNAPSHOT