manual merge of quoth's timezone branch