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