Merge branch 'master' into #299
Merge branch '#299' of github.com:GalSim-developers/GalSim into #299