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