Update history to reflect merge of #985. Closes #980.