Merge/wpcom 2014 12 04

@blowery could you confirm everything is there? Thanks!