Add timestamp to events after rebasing onto master