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