Merge branch '9343-no-env-vars'
authorTom Clegg <tom@curoverse.com>
Thu, 2 Jun 2016 20:51:11 +0000 (16:51 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 2 Jun 2016 20:51:11 +0000 (16:51 -0400)
refs #9343


Trivial merge