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