Merge remote-tracking branch 'working/user/gmcharlt/lp1452366_preinit_context_loaders...
authorBill Erickson <berickxx@gmail.com>
Tue, 9 Jun 2015 14:56:21 +0000 (07:56 -0700)
committerBill Erickson <berickxx@gmail.com>
Tue, 9 Jun 2015 14:56:21 +0000 (07:56 -0700)

Trivial merge