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