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