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