Imported Upstream version 4.3
Merge tag 'upstream/4.3'

Upstream version 4.3