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