Pre-requisite changes for 2.11 that are applicable to 2.10.
Changes specific to Scala 2.11.
Merge pull request #512 from marcsaegesser/2.11-b

Support for Scala 2.11