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