Merge branch 'master' into 'develop/gogs'

# Conflicts:
#   templates/Gogs/0/rancher-compose.yml

templates/Gogs/0/rancher-compose.yml

@@ -11,7 +11,7 @@ catalog:
     - variable: "HOST_LABEL"
       label: "Host Label Key/Value Pair"
       description: |
-        The Label Key/Value pair on the host which containers should be deployed
+        The Label Key/Value pair of the host which containers should be deployed
       default: "host.id=Host1"
       required: false
       type: string
@@ -33,7 +33,7 @@ catalog:
       type: password
 
     - variable: "DB_USER_PASS"
-      label: "MySQL User Password"
+      label: "Database User Password"
       description: |
         A secure password to be used by the "gogs_user" database user.
       # default: