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