Tested up to 3.9

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