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