Automerge

Queued GitHub PR auto-merge with conflict repair hooks.