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