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