merged master into #563, fixed up CHANGELOG after conflict
merged master into #563, fixed up CHANGELOG after conflict, prefer my merge over Mike's because of my missing period in the 563 entry