support Scala 2.11
merge master