Merge branch 'master' into develop
Hotfix - Separate class definition, so its autoloadable.
Merge branch 'hotfix'