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