Pull the fixed for the vertical interpolation of the temperature and salinity from the dev branch into master