Merge this lagging branch.

This branch is "lagging" and not prepared for a fast-forward merge. As such, it can not be automatically closed.