Merge branch 'release/1.1.5'
Cleanup
Composer and php updates
Version bump 1.4.0
merge
Merge branch 'release/1.4.0' into develop
Merge branch 'master' into develop
Update composer trailing comma
Merge branch 'release/1.4.0'
Merge branch 'release/1.4.0'
fix merge conflict
Merge branch 'master' into develop