Imported Upstream version 1.4.2
Merge tag 'upstream/1.4.2'

Upstream version 1.4.2