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