Imported Upstream version 3.5
Imported Debian patch 3.5-1
Merge tag 'debian/3.5-1'

Debian release 3.5-1