Trunk 5.1 Bug Fixes

git-svn-id: https://plugins.svn.wordpress.org/wp-flybox/trunk@912888 b8457f37-d9ea-0310-8a92-e5e31aec5664