syncro with branch

git-svn-id: https://plugins.svn.wordpress.org/upprev/trunk@885887 b8457f37-d9ea-0310-8a92-e5e31aec5664