Use most recent Scala version for Travis build
Merge branch 'master' into scala-2.10