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