Fix for being unable to set site or theme to a blank value once it had been set.
Merge remote-tracking branch 'origin/master'