Updated history to reflect merge of #793. Closes #787.