Merge remote-tracking branch 'civi/4.7.12-rc'
authorColeman Watts <coleman@civicrm.org>
Thu, 22 Sep 2016 18:42:28 +0000 (14:42 -0400)
committerColeman Watts <coleman@civicrm.org>
Thu, 22 Sep 2016 18:42:28 +0000 (14:42 -0400)

Trivial merge