scala/scala — pull request #3157 by dotta (2013-11-19 12:39:35+00:00)
Title: Backport of SI-7915

(cherry picked from commit 3009a525b58a4c7865ff524899b85518884ee5f7)