Imported Upstream version 3.3.5
Imported Upstream version 4.0.4
Merge tag 'upstream/4.0.4'

Upstream version 4.0.4
refresh and remove patches
update changelog