merged in upstream/0.4.6
Update changelog for 0.4.6