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