Merge branch 'master' of https://github.com/USGS-Astrogeology/CSM-Swig