Upgrade Catch.app to v1.8
Merge pull request #6009 from elmak/catch

Upgrade Catch.app to v1.8