47fa800
New upstream version 1.36.6. (cherry picked from commit c4bd84b097ba1d84e526a908f146ec8bf382084d)