Merge branch 'hotfix/config-merge'
Merge branch 'post/zend-server-part-8'
Added closing `>` to tag, fixing layout
Merge branch 'hotfix/post-8-formatting' into develop