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