f1f643f
New upstream version 1.36.7. (cherry picked from commit e83612e3d2d22a1cf6e7bffc8592e7c8e130b8ad)