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