Patch 4

This is a two-parter. Needs corresponding changes to theme-customizer.php (separate pull immediately before this one).