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