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