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