Merge pull request #11852 from civicrm/5.0