Merge pull request #3653 from totten/master-case-failures