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