local commit from svenn
Merge remote-tracking branch 'origin/master' into SvennSmartBranch
Merge remote-tracking branch 'origin/SvennSmartBranch'