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