Merge pull request #10290 from civicrm/4.7.19-rc
authorTim Otten <totten@civicrm.org>
Tue, 2 May 2017 05:40:22 +0000 (22:40 -0700)
committerGitHub <noreply@github.com>
Tue, 2 May 2017 05:40:22 +0000 (22:40 -0700)
Merge forward (4.7.19-rc => master)


Trivial merge