Merge pull request #5038 from civicrm/CRM-15877