Change to 2.11 should not be included when committing new patch
Support Scala 2.11 build