Require our modified version of o.c.opibuilder
Merge branch 'build-hacks'