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