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