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