Merge branch 'topic/POLLPRI_workaround'
Do not use POLLPRI on Windows
Merge branch 'topic/no_POLLPRI_on_Windows' into develop