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