Merge branch 'loading-components-in-disabled-extension-issue' of https://github.com...
authorTim Otten <totten@civicrm.org>
Fri, 24 Jun 2016 16:17:23 +0000 (09:17 -0700)
committerTim Otten <totten@civicrm.org>
Fri, 24 Jun 2016 16:17:23 +0000 (09:17 -0700)

Trivial merge