Add credit where credit is due.
Merge latest changes from 'gh-pages'