WP 3.7.1 (rebased this time)

I'm so embarrassed. I swear to $GOD I know how to do this stuff, honest.