* commit '6317315e733f115aa6ad0339c1a334607fd04342': Deliberately break DateFormat.format's formatting of 'k' for compatibility.
* commit '6317315e733f115aa6ad0339c1a334607fd04342': Deliberately break DateFormat.format's formatting of 'k' for compatibility.