Update 2.1 for Wordpress 4.0 support

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