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