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