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