Merge branch 'master' into win32-3