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