Documentation: apache instead of lorem
Merge branch 'master' into apache