Update history to reflect merge of #1328
Update history to reflect merge of #1330