Merge branch 'develop'
Update Apache module.