Incl. updated Apache config file.
Incl. updated Apache config file.
Merge branch 'develop'