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