Imported Upstream version 2.1.3
Merge tag 'upstream/2.1.3'

Upstream version 2.1.3