afbb279825
environment. Contributed by Jason Lowe. (cherry picked from commit b056048114bf4701ef9dd22486db937cb589e81b)