Another attempt at a fix for DeleteSamples and ResetDateTime.
Merge branch 'dev' into nzbdrone