Not sure how to best capture this
Merge pull request #650 from http2/jp

Credit where credit is due