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