Merge remote-tracking branch 'origin/4.7.22-rc'
authorTim Otten <totten@civicrm.org>
Sat, 8 Jul 2017 00:54:39 +0000 (17:54 -0700)
committerTim Otten <totten@civicrm.org>
Sat, 8 Jul 2017 00:54:39 +0000 (17:54 -0700)

Trivial merge