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

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