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