Re-apply recent changes made ready for 9.5 that were wiped in 10.0

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