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