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