Merge branch 'sh/mingw-safer-compat-poll'