Merge pull request #4794 from civicrm/CRM-15740