Merge pull request #99 from scala-js/master

Merge upstream master into 2.11