Merge "Fix title handling in User::getCanonicalName"