Merge 20140804

This represents the latest changes from wpcom to be merged into Jetpack.