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