Merge branch 'typo'

git-svn-id: https://plugins.svn.wordpress.org/sunny/trunk@959593 b8457f37-d9ea-0310-8a92-e5e31aec5664
Merge branch 'tag-1.2.0'

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