KFSTP-1621 fix labels for generic dates, and don't use short labels if we can avoid it
KFSTP-1621 add short labels, just to make everything safe
Merge pull request #113 from smith750/KFSTP-1621

KFSTP-1621