Merge "Avoid deadlocks in User::incEditCount"