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