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