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