Historical Rules · 11 November 2016
Rule 511.2
Official source text from the 11 November 2016 Rules release
Abilities that trigger “at end of combat” trigger as the end of combat step begins. Effects that last “until end of combat” expire at the end of the combat phase.