Merge branch 'master' into develop
Fixed issue with php version
Merge branch 'develop'