Merge "Begin introducing PHP 5.6 variadic parameters where appropriate"