Merge branch '2.x' into 3.x

# Conflicts:
#	README.md

Author: marickvantuil

README.md

@@ -144,7 +144,7 @@ More info: https://cloud.google.com/docs/authentication/production
 <details>
   <summary>Service Account Roles</summary>
 
-If you're not using your master service account (which have all of the abilities), you must add the following roles to make it works:
+If you're not using your master service account (which has all abilities), you must add the following roles to make it works:
 1. App Engine Viewer
 2. Cloud Tasks Enqueuer
 3. Cloud Tasks Viewer