Update history to reflect merge of #872. Closes #842.