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