Travis tweaks.
Merge branch 'master' into scala-2.11.x