scala/scala — pull request #3947 by lrytz (2014-08-26 12:50:31+00:00)
Title: Backporting from 2.12.x to 2.11.x

Re-submission of #3926, with 2.11.x merged and the conflict resolved