Merge pull request #9630 from colemanw/4.7.15-rc
authorcolemanw <coleman@civicrm.org>
Wed, 4 Jan 2017 17:15:34 +0000 (12:15 -0500)
committerGitHub <noreply@github.com>
Wed, 4 Jan 2017 17:15:34 +0000 (12:15 -0500)
Backport CRM-19799 to 4.7.15


Trivial merge