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