Updates for OCHamcrest 3.0.1