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