ChangeLog for eddf53cc16784e931a1e4e94795900395dd8a4fe
Merge remote-tracking branch 'upstream/master'