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