Merge branch 'settings-api'

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

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