Jetpack: Merge in changesets r813779 and r813786 from trunk for the point release, thanks @stephdau!


git-svn-id: https://plugins.svn.wordpress.org/jetpack/branches/2.6-legacy@813791 b8457f37-d9ea-0310-8a92-e5e31aec5664