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