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