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