Merge branch 'develop'
Merge remote-tracking branch 'origin/master' into develop
composer.json file bumped
1.0.15
Merge branch 'develop'
Merge branch 'master' into develop