Merge commit, because Mercurial's handling of push races is bloody awful