This was copied out of a wip branch in 3704eb13.
This branch is the result of
Merging the result with master makes no changes to master's tree.
master