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