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