Merge WPCOM changes 2014 12 02

@lancewillett @jkudish @aduth @rralian @kellychoffman @justinshreve could you confirm your commits are good to go?
This change is fine for now, but it's related to #1237 #1272 #1286 -- so will probably be updated shortly to use a better way.