Merge branch 'master' into svn2

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