Fix bug 873624 - Merge "Don't allow zero/negative INTERVAL, assume 1" from upstream.