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