Fixing build issue under sbt 0.13.0 (tests failing due to missing JavaScript engine)
Merge branch 'master' into release-1.0