Update autoloader - migration on PHP 5.4
Merge remote-tracking branch 'origin/master'