Fixes compiler error for some versions of GCC
- Manual application of PR #196 (couldn’t merge)
- See also #226
Updated project for OCUnit
Build 20
Build 20

Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	README.md
	single_include/catch.hpp