Merge "Add ability to show the time taken by update.php"