Merge "Make User::getEditCount() always return an integer"