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