Merge changelog cleanup from alioth, and re-cleanup