Backports PR #804 to 3.0.x-2.10

This was tested using the following config file for the uber-build:
https://gist.github.com/huitseeker/ad5372f70a4ada4378ee

And the following branch for Scala-refactoring, which contains just 1 version bump:
https://github.com/huitseeker/scala-refactoring/tree/bump-3.0.x