Merge branch 'master' into develop
Arg the dreaded array/object problem.
composer.json file bumped
1.0.13
Merge branch 'develop'