Imported Upstream version 4.1.3
Merge tag 'upstream/4.1.3'

Upstream version 4.1.3
Upgrade to 4.1.3-1