Merge branch 'master' into optiql-beta

Conflicts:
	project/Build.scala
	src/library/Scala.scala