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