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