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