Merge branch 'jh/rlimit-nofile-fallback'