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