Imported Upstream version 4.6
Merge tag 'upstream/4.6'

Upstream version 4.6