This is for the man

_ZPH and @jcsextro, two men

Amos
Merge remote-tracking branch 'origin/master' into gh-pages