Wpcom merge 8 dec2014