Merge branch 'master' into scala-2.11

Conflicts:
	compiler/src/main/scala/scala/scalajs/compiler/PrepJSInterop.scala