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