Imported Upstream version 4.2.u5
Merge tag 'upstream/4.2.u5'

Upstream version 4.2.u5