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