Merge branches 'master' and 'dev/stijn'
Merge branches 'dev/stijn' and 'master' into dev/stijn