Merged TEST-BRANCH-VOOR-ANDY en -MIKE

Status: Success!