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