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