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