Adjusted to build for Scala 2.11.0 final.