[UP] Changelog
Merge branch 'master' into weblog