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