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