Merge branch 'timestamps-without-dayname'