socket & service
Merge commit '53b1398809dac339893fff031a658ca93fab1fee' into experimental/php
Merge branch 'experimental/php' into refs/top-bases/experimental/marc
Merge remote-tracking branch 'refs/remotes/gh/experimental/marc' into HEAD
fix php-fpm-5.2 startup
Merge branch 'experimental/php' into refs/top-bases/experimental/marc
Merge commit 'refs/top-bases/experimental/marc' into experimental/marc