scala/scala — pull request #3011 by retronym (2013-10-02 14:50:45+00:00)
Title: Merge/master to java7 2

Review by @gkossakowski