another attempt to work out connection handling with php-fpm
Merge commit 'meat-team.r07.em' into integration