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