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