Imported Upstream version 1.1.3
Merge tag 'upstream/1.1.3'

Upstream version 1.1.3