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