OCHamcrest 4.0.0
Merge pull request #11659 from jonreid/master

OCHamcrest 4.0.0