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