merge commit
Merge branch 'master' into stefansBranch
Signed-off-by: Sjoerd <Sjoerd@afrogleap.com>
git mergin
Merge branch 'master' into stefansBranch
fixed conflicts