Make sure theme-switching functionality is not hooked on AJAX calls that change the theme...
Merge branch 'staging' into wpa