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