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