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