2.1.2 bug fixes


git-svn-id: https://plugins.svn.wordpress.org/eps-301-redirects/trunk@901844 b8457f37-d9ea-0310-8a92-e5e31aec5664