java nio
commit
Merge commit 'e5d4eefe6c903e0ea9a3ab53c2b923610e0cd4ee'; commit 'f0375668d80172032395a8cb8118c5e4556cb3bf'