1.6.4 more 3.8 fixes

git-svn-id: https://plugins.svn.wordpress.org/customize-admin/trunk@820302 b8457f37-d9ea-0310-8a92-e5e31aec5664