Merge 2.11.x into 2.12.x

The last commit fixes the failing test in https://scala-webapps.epfl.ch/jenkins/job/scala-integrate-2.11.x-to-2.12.x/87/console