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