Assuming the reason why my patch wasn't being merged was because it didn't use the X-TIMESTAMP-MAP, I have included the changes for that. Those changes were basically a merge of work done by anssi.hannula at iki.fi which is why I've cc'd them.