Merge pull request #8244 from civicrm/totten-patch-1