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