Update Scala version for Travis builds
Merge branch 'develop' into feat/metadata