Merge remote-tracking branch 'origin/4.7.16-rc' into master-4716
authorTim Otten <totten@civicrm.org>
Thu, 9 Feb 2017 02:07:38 +0000 (18:07 -0800)
committerTim Otten <totten@civicrm.org>
Thu, 9 Feb 2017 02:07:38 +0000 (18:07 -0800)

Trivial merge