Merge branch 'mockiemockiz-composer' to master
Merge branch 'master' into develop