Merge branch '2.0'

# Conflicts:
#	VERSION
#	app/Handlers/Events/Incident/SendIncidentEmailNotificationHandler.php
#	app/Handlers/Events/Incident/SendMaintenanceEmailNotificationHandler.php
#	app/Models/Subscriber.php

app/Models/Subscriber.php

@@ -64,13 +64,13 @@ class Subscriber extends Model implements HasPresenter
     }
 
     /**
-     * Scope a query to only include verified subscribers.
+     * Scope verified subscribers.
      *
      * @param \Illuminate\Database\Eloquent\Builder $query
      *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeVerified(Builder $query)
+    public function scopeIsVerified(Builder $query)
     {
         return $query->whereNotNull('verified_at');
     }