Merge remote-tracking branch 'origin/master' into code-cleanups-win32