Fixed bug in date munging
Merge branch 'master' into ngds-style