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