Merge pull request #3655 from totten/master-casetype-delete-2