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