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