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