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