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