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