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