Merge branch 'master' into dimswapBugfixes
Merge remote-tracking branch 'origin/dimswapBugfixes' into dimswapBugfixes