merged master into #581, fixed conflict in CHANGELOG.md
Merge branch '#581' of github.com:GalSim-developers/GalSim into #581