Added instrumentation to try and detect NaNs in resampling, die in flames instead.
Merge branch 'master' into feature-fisher