Update history to reflect merge of #871.