Update history to reflect the merge of #860