Update history to reflect merge of #1198.