am cfd31c5e: Merge "Use a (somewhat) more documented environment variable."

* commit 'cfd31c5e266d1aecc66278fdea46e88e323a181d':
  Use a (somewhat) more documented environment variable.