Pull in latest changes from openberkeley_wysiwyg_override.