Merge branch 'correctly-upgrade-and-default-email-frequency'

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