Added support for Scala 2.11.4