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