Merged in a change which causes update.php to be gentler (tests slave-lag). Part...