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