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