adde stof as a merger
feature #3989 adde stof as a merger (fabpot)

This PR was merged into the 2.3 branch.

Discussion
----------

adde stof as a merger

Commits
-------

5ce376e adde stof as a merger
Backporting #2952, which I committed to master instead of 2.3
Merge branch '2.3' into 2.4
Merge branch '2.4' into 2.5
Merge branch '2.5'