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