Merge "(bug 40531) profileinfo.php: Clean up"