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