Change format to conform to strftime() rather than date()

Fixes issue #1621