Update history to reflect merge of #994 [ci skip]