Update history to reflect merge of #536