Imported Upstream version 1.7.37
Merge tag 'upstream/1.7.37'

Upstream version 1.7.37
Merge remote-tracking branch 'origin/master'