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