WP 4.0 compatible

git-svn-id: https://plugins.svn.wordpress.org/groups/trunk@983155 b8457f37-d9ea-0310-8a92-e5e31aec5664
tagged 1.4.11

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