scala 2.11.x+ only
Merge pull request #337 from ambiata/topic/scala-2.11

scala 2.11.x+ only