When roles are modified - change future events
Merge remote-tracking branch 'origin/master'