Merge "Fix plural in mergehistory-done message"