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