Update history to reflect merge of #966
Update history to reflect merge of #956