Merging in up-to-date code from wp.com vip repo