update changelog for v3.3.1
merge changelog from master