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