This is the merge that apparently failed following my previous (approved) Merge Request of this morning.