Committing outstanding changes from live server and core.php.