Updated history to reflect merge of #777.