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