Merge branch 'EnvControl-fixes'
authorJon Trulson <jon@radscan.com>
Fri, 17 Aug 2012 12:01:19 +0000 (06:01 -0600)
committerJon Trulson <jon@radscan.com>
Fri, 17 Aug 2012 12:01:19 +0000 (06:01 -0600)

Trivial merge