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