Merge "Include preg_last_error() in error message when preg_* fails"