assume JDK 8 (no permgen)
Merge branch 'master' into sbt-0.13.2