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