Merge pull request #6367 from neheb/libaio