Fix java7 branch

I noticed that one of our Java7-specific jobs started to fail recently with merge conflict: https://scala-webapps.epfl.ch/jenkins/job/scala-nightly-auxjvm/jdk=jdk7,label=auxjvm/1864/console

Merging latest master into java7 branch should fix that.

Review by @retronym (I wanted to say @adriaanm but he is busy traveling and I want this to go through fast)