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