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