Merge branch 'et/win32-poll-timeout'