Imported Upstream version 3.6.2
Merge tag 'upstream/3.6.2'

Upstream version 3.6.2
Update changelog