php-Raven: merge rawhide changes (backport)