Merge pull request #8245 from colemanw/CRM-18006-b
authorTim Otten <totten@civicrm.org>
Wed, 27 Apr 2016 01:15:22 +0000 (18:15 -0700)
committerTim Otten <totten@civicrm.org>
Wed, 27 Apr 2016 01:15:22 +0000 (18:15 -0700)
Last-minute upgrade fixes


Trivial merge