Assume that no timezone transition rules specify 4th or 5th week of month
Merge remote-tracking branch 'upstream/master'