A killer pull request.

Merge me.  Merge me now!