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