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