Merge branch '9119-oj-load-strict'
authorTom Clegg <tom@curoverse.com>
Tue, 3 May 2016 16:48:01 +0000 (12:48 -0400)
committerTom Clegg <tom@curoverse.com>
Tue, 3 May 2016 16:48:01 +0000 (12:48 -0400)
refs #9119


Trivial merge