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