Imported Upstream version 1.1.4
Merge tag 'upstream/1.1.4'

Upstream version 1.1.4