More fixes - see changelog for full details

git-svn-id: https://plugins.svn.wordpress.org/wpform-flg360/trunk@852592 b8457f37-d9ea-0310-8a92-e5e31aec5664