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