V3.0 vip

Merge new sailthru branch changes into automattic repo