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