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