Merge from develop_scala-2.10

prepare for release of 1.3.11