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