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