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