Merge master into 1.3.x

I would like to have some changes of the master branch in the 1.3.x branch, to be able to use the stubs for the 1.3 version.