Merge pull request #12335 from civicrm/5.3