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