Merge upstream version

Merging in changes done on original repo (bumping version after PR with Scala 2.11 has been accepted)