Merge branch '0.13' of github.com:sbt/sbt into 0.13
Fix obtuse compilation error
Merge branch '0.13' of github.com:jedesah/sbt into 0.13

Conflicts:
	ivy/src/main/scala/sbt/IvyInterface.scala