Merge commit 'refs/top-bases/t/config/auto-fcgi' into t/config/auto-fcgi