Merge "Implement action=mergehistory"