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