Fixes missing autoloader class
Merge branch 'develop'