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