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