Updated Scala travis version
Merge branch 'master' into scala-2.11

Conflicts:
	.travis.yml