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