autoloader improvements
Merge branch 'master' into dev-events-oli