Merge in all the WC Builder/Simple News updates