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