Update history to reflect merge of #1121
Update history to reflect merge of #1114