Merge tag 'upstream/1.1'

Upstream version 1.1