Merge branch 'jc/emfile'