Updated so skins can use long (id=3999) or short date (id=4000)
Merge remote-tracking branch 'origin/master'