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