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