Merge pull request #2100 from glyg/master

Remove DeprecationWarning in simple_linear_interpolation