master builds

[Daan Hoogland]

People,

A lot of builds are broken @jenkins.bac.o. Can people that have been
working on master lately please have a look, I spent a lot of time
getting most of the build working last week. Would be nice if we can
keep them working.

-- 
Daan