Merge pull request #11466 from coolbit/CRM-21602
authorcolemanw <coleman@civicrm.org>
Sat, 30 Dec 2017 21:34:57 +0000 (16:34 -0500)
committerGitHub <noreply@github.com>
Sat, 30 Dec 2017 21:34:57 +0000 (16:34 -0500)
Crm 21602


Trivial merge