Imported Upstream version 1.5.1
Merge tag 'upstream/1.5.1'

Upstream version 1.5.1
Imported Upstream version 1.5.1