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