Change trigger to fire _after_ the event
Merge remote-tracking branch 'upstream/master'