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