7213c935c6
(Contributed by Erik Krogen via Daniel Templeton) (cherry picked from commit 09f28da2d2aae1487bae85ff110794f8346f92a4)