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