Merge branch 'release-1.1' into develop
Apache configuration sample
Merge branch 'develop'