Roll out M39.0.2171.62
Merge pull request #2625 from darktears/master

Roll out M39.0.2171.62