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