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