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