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