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