Merge branch 'ipce' of https://github.com/USGS-Astrogeology/ISIS3 into ipce