Merge "Fix out-of-order entry in autoload.php"