Imported Upstream version 1.7.42
Merge tag 'upstream/1.7.42'

Upstream version 1.7.42