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