Manually implemented #310 from @Trismegiste.
Merge branch 'gh-pages' of github.com:codeguy/php-the-right-way into gh-pages