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