Merge branch 'use-qdox-2' of https://github.com/josephw/JavaHamcrest