Merging in CentOS IUS package changes from chef-php-extra.
Merge remote-tracking branch 'origin/master'