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