merge of the stable branch into master

I want to push this directly into the master branch. There was only one conflict (see merge commit).

Any remarks?