Merge pull request #452 from GalSim-developers/#449

#449 Changes needed for great3 control branches
Merge branch 'master' into #430