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