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