A little cleanup, also don't force iocpreactor on Windows
Fix a bad rebase
Merge remote-tracking branch 'upstream/master'