Imported Upstream version 1.5
Merged upstream/1.5
Imported Upstream version 1.6.1
Merge tag 'upstream/1.6.1'

Upstream version 1.6.1
new upstream release