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