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