Merge pull request #12863 from civicrm/5.6