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