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