Merge php-beast