Fix honeypot content-type issue.

Fixes #708.
Merge remote-tracking branch 'origin/hub' into hub