pre merge 1.6


git-svn-id: https://plugins.svn.wordpress.org/child-theme-configurator/branches/split-options@1032905 b8457f37-d9ea-0310-8a92-e5e31aec5664