Imported Upstream version 1.3.11
Merge tag 'upstream/1.3.11'

Upstream version 1.3.11
Update changelog

Signed-off-by: Vlad <vg@vladgh.com>