make interpolation ignore null values
Merge branch 'nulls'