Merge branch 'hotfix/1.0b4.1'
fix psr-0
Merge branch 'hotfix/1.0b4.2' into develop