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