am 6d49184b: Merge "Workaround stack overflow issue with clang"

* commit '6d49184bb841f2645924361d945a8bc418fc05c6':
  Workaround stack overflow issue with clang