Merge branch 'jh/rlimit-nofile-fallback' into maint