Merge pull request #6773 from civicrm/eileenmcnaughton-patch-1