Merge branch 'release/1.0' into feature/SNX-3-publish-scala-2.11-release