Merge "Keep $user->mEditCount up to date"