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