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