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