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