Fix Scala tests on Travis
Merge pull request #1417 from sgrif/sg-fix-travis-scala

Fix Scala tests on Travis