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