Minor fix to the psr autoload dir
Merge branch 'hotfix/fixPsrDir'
Merge branch 'master' into develop