Perhaps fix build issues with Scala?
Merge remote-tracking branch 'origin/master'