Optimize the composer_autoload check
E_DEPRECATED is not available in PHP 5.2
Update a config_item() use case for the new NULL return value
Merge remote-tracking branch 'upstream/develop' into improved/develop