2.10.x

merge master into 2.10.x

let's follow the same merge strategy as in scala/scala: send PR to 2.10.x when it should be both in 2.10 and 2.11, merge to master