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