Use my fork of contrib (until upstream can be built on Travis).