Commits
Merge branch 'master' into CAS-13087
Conflicts: build.conf casa5/code/msvis/MSVis/VisImagingWeight.cc casa5/code/synthesis/ImagerObjects/CubeMajorCycleAlgorithm.cc casa5/code/synthesis/ImagerObjects/CubeMinorCycleAlgorithm.cc casa5/code/synthesis/ImagerObjects/SIImageStore.cc casa5/code/synthesis/ImagerObjects/SIImageStore.h casa5/code/synthesis/ImagerObjects/SimpleSIImageStore.cc casa5/code/synthesis/ImagerObjects/SynthesisDeconvolver.cc casa5/code/synthesis/ImagerObjects/SynthesisImager.cc casa5/code/synthesis/ImagerObjects/SynthesisImager.h casa5/code/synthesis/ImagerObjects/SynthesisImagerVi2.cc casa5/code/synthesis/ImagerObjects/SynthesisImagerVi2.h casa5/code/synthesis/ImagerObjects/SynthesisUtilMethods.cc casa5/code/synthesis/ImagerObjects/SynthesisUtilMethods.h casa5/code/synthesis/TransformMachines2/VisModelData.cc casa5/gcwrap/python/scripts/sdutil.py casa5/gcwrap/python/scripts/task_sdintimaging.py casa5/gcwrap/python/scripts/task_tclean.py casa5/gcwrap/python/scripts/task_tsdimaging.py casa5/gcwrap/python/scripts/tests/test_ia_regrid.py casa5/gcwrap/python/scripts/tests/test_importfitsidi.py casa5/gcwrap/python/scripts/tests/test_imregrid.py casa5/gcwrap/python/scripts/tests/test_makemask.py casa5/gcwrap/python/scripts/tests/test_nrobeamaverage.py casa5/gcwrap/python/scripts/tests/test_plotprofilemap.py casa5/gcwrap/python/scripts/tests/test_plotweather.py casa5/gcwrap/python/scripts/tests/test_req_task_imdev.py casa5/gcwrap/python/scripts/tests/test_req_task_rmfit.py casa5/gcwrap/python/scripts/tests/test_req_task_sdintimaging.py casa5/gcwrap/python/scripts/tests/test_rg_fromtextfile.py casa5/gcwrap/python/scripts/tests/test_sdcal.py casa5/gcwrap/python/scripts/tests/test_sdfit.py casa5/gcwrap/python/scripts/tests/test_sdgaincal.py casa5/gcwrap/python/scripts/tests/test_sdimaging.py casa5/gcwrap/python/scripts/tests/test_sdpolaverage.py casa5/gcwrap/python/scripts/tests/test_sdsidebandsplit.py casa5/gcwrap/python/scripts/tests/test_stk_alma_pipeline_imaging.py casa5/gcwrap/python/scripts/tests/test_tclean.py casa5/gcwrap/python/scripts/tests/test_tsdimaging.py casatasks/setup.py casatasks/src/scripts/cleanhelper.py casatasks/src/scripts/restfreqtool.py casatasks/src/scripts/sdutil.py casatasks/src/tasks/task_sdintimaging.py casatasks/src/tasks/task_tclean.py casatasks/src/tasks/task_tsdimaging.py casatasks/tests/tasks/test_asdmsummary.py casatasks/tests/tasks/test_importfitsidi.py casatasks/tests/tasks/test_imregrid.py casatasks/tests/tasks/test_makemask.py casatasks/tests/tasks/test_nrobeamaverage.py casatasks/tests/tasks/test_plotprofilemap.py casatasks/tests/tasks/test_req_task_imdev.py casatasks/tests/tasks/test_req_task_rmfit.py casatasks/tests/tasks/test_sdcal.py casatasks/tests/tasks/test_sdfit.py casatasks/tests/tasks/test_sdgaincal.py casatasks/tests/tasks/test_sdimaging.py casatasks/tests/tasks/test_sdsidebandsplit.py casatasks/tests/tasks/test_tclean.py casatasks/tests/tasks/test_tsdimaging.py casatasks/tests/tasks/testhelper.py casatests/stakeholder/test_stk_alma_pipeline_imaging.py casatools/ac/templates/setup.py.in casatools/tests/tools/image/test_ia_regrid.py casatools/tests/tools/regionmanager/test_rg_fromtextfile.py