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