Recommit of 3.5.3 with missing changes

git-svn-id: https://plugins.svn.wordpress.org/business-directory-plugin/trunk@1037673 b8457f37-d9ea-0310-8a92-e5e31aec5664