mac crap
Merge branch 'master' into Sjoerd_branch
Merge branch 'master' into stefansBranch