Merge branch 'master' into svnsync

git-svn-id: http://plugins.svn.wordpress.org/jetpack/trunk@795083 b8457f37-d9ea-0310-8a92-e5e31aec5664