Merge "API: Account for PHP 7.2 change"