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