Tested up to WordPress 4.1

git-svn-id: https://plugins.svn.wordpress.org/content-parts/trunk@1046909 b8457f37-d9ea-0310-8a92-e5e31aec5664