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