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