Hrm.
That was a painless merge conflict!