Merge pull request #3574 from totten/master-casetype-redir