Merge branch 'master' into scala-2.11