Updated history to reflect merge of #820.