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