Update history to reflect merge of #2588 [ci skip]
Updated site history