Merge "Fix issue with 32 bit versions of asyncio"