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