Update README.md
Merge branch 'master' into apache
Merge branch 'apache' into apache-php