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