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