Changed version number in source
Merge branch 'master' into scala-2.11