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