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