Upgrade from scala 2.9.1 to scala 2.10 (works for me)
Merge branch 'master' into foundation-mockup