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