Imported Upstream version 1.3.1
Imported Upstream version 1.3.1
Merge tag 'upstream/1.3.1'

Upstream version 1.3.1