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