Imported Upstream version 3.5.1
Merge tag 'upstream/3.5.1'

Upstream version 3.5.1
prepare 3.5.1-1 release