Deferring file closing causes a to many files open error
Merge remote-tracking branch 'origin/master'