Imported Upstream version 2.1
Merge tag 'upstream/2.1'

Upstream version 2.1