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