Build now fails if initmod doesn't compile
Merge branch 'master' into nick-sandbox