Merge branch 'docs/apache-config' into 'develop'