Synced over the extent of this commit to WordPress.com VIP (except the unit tests).

If you could commit against an issue when you’re making improvements, it would be much appreciated. It’s much easier to refer to a series of commits this way 🙂

Thanks guys