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