Clean up CHANGES. Missing links. Pretty
Merge remote-tracking branch 'upstream/master'