Imported Upstream version 3.3.1
remove applied upstream patches
update changelog