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