Close DE632 by adding timezone configurability.
Fix up stupid space-related merge conflict.