merge opscode-cookbooks/php/pull/23