Update changelog
Merge branch '1.x'