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