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