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