Fix configuring
Merge branch 'GEWIS' into multicontest

* GEWIS:
  Fix configuring