Update changelog
Imported Upstream version 0.3.6
Merge commit 'upstream/0.3.6'