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