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