Imported Upstream version 1.1.5
Merge tag 'upstream/1.1.5'

Upstream version 1.1.5