xstrp4 requires camlp4
Merge pull request #2577 from yallop/xstrp4-camlp4

xstrp4 requires camlp4