Sort plugin events by enabled
Sort plugin events by enabled

* origin/master:
  Sort plugin events by enabled