Merge branch 'hotfix/basedirs' into develop
- Bump version for packagist
Merge branch 'release/1.2.5'