Imported Upstream version 1.3.10
Merge tag 'upstream/1.3.10'

Upstream version 1.3.10