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