diff --git a/README.md b/README.md
index ecfea0fa..7bbf58fd 100644
--- a/README.md
+++ b/README.md
@@ -805,6 +805,7 @@ Below is the complete list of available options that can be used to customize yo
 | `GITLAB_EMAIL` | The email address for the GitLab server. Defaults to value of `SMTP_USER`, else defaults to `example@example.com`. |
 | `GITLAB_EMAIL_DISPLAY_NAME` | The name displayed in emails sent out by the GitLab mailer. Defaults to `GitLab`. |
 | `GITLAB_EMAIL_REPLY_TO` | The reply-to address of emails sent out by GitLab. Defaults to value of `GITLAB_EMAIL`, else defaults to `noreply@example.com`. |
+| `GITLAB_EMAIL_SUBJECT_SUFFIX` | The e-mail subject suffix used in e-mails sent by GitLab. No defaults. |
 | `GITLAB_EMAIL_ENABLED` | Enable or disable gitlab mailer. Defaults to the `SMTP_ENABLED` configuration. |
 | `GITLAB_INCOMING_EMAIL_ADDRESS` | The incoming email address for reply by email. Defaults to the value of `IMAP_USER`, else defaults to `reply@example.com`. Please read the [reply by email](http://doc.gitlab.com/ce/incoming_email/README.html) documentation to curretly set this parameter. |
 | `GITLAB_INCOMING_EMAIL_ENABLED` | Enable or disable gitlab reply by email feature. Defaults to the value of `IMAP_ENABLED`. |
diff --git a/assets/build/install.sh b/assets/build/install.sh
index 5320a47a..31228401 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -231,16 +231,7 @@ priority=10
 directory=${GITLAB_INSTALL_DIR}
 environment=HOME=${GITLAB_HOME}
 command=bundle exec sidekiq -c {{SIDEKIQ_CONCURRENCY}}
-  -q post_receive
-  -q mailers
-  -q archive_repo
-  -q system_hook
-  -q project_web_hook
-  -q gitlab_shell
-  -q incoming_email
-  -q runner
-  -q common
-  -q default
+  -C ${GITLAB_INSTALL_DIR}/config/sidekiq_queues.yml
   -e ${RAILS_ENV}
   -t {{SIDEKIQ_SHUTDOWN_TIMEOUT}}
   -P ${GITLAB_INSTALL_DIR}/tmp/pids/sidekiq.pid
diff --git a/assets/runtime/config/gitlab-shell/config.yml b/assets/runtime/config/gitlab-shell/config.yml
index 82fe460a..bcaaefaf 100644
--- a/assets/runtime/config/gitlab-shell/config.yml
+++ b/assets/runtime/config/gitlab-shell/config.yml
@@ -68,3 +68,10 @@ audit_usernames: false
 # For Debian and Ubuntu systems this can be done with: sudo apt-get install git-annex
 # For CentOS: sudo yum install epel-release && sudo yum install git-annex
 git_annex_enabled: false
+
+# Git trace log file.
+# If set, git commands receive GIT_TRACE* environment variables
+# See https://git-scm.com/book/es/v2/Git-Internals-Environment-Variables#Debugging for documentation
+# An absolute path starting with / – the trace output will be appended to that file.
+# It needs to exist so we can check permissions and avoid to throwing warnings to the users.
+git_trace_log_file:
diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index 07d4fa71..7efbb2c0 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -67,6 +67,7 @@ production: &base
     email_from: {{GITLAB_EMAIL}}
     email_display_name: {{GITLAB_EMAIL_DISPLAY_NAME}}
     email_reply_to: {{GITLAB_EMAIL_REPLY_TO}}
+    email_subject_suffix: '{{GITLAB_EMAIL_SUBJECT_SUFFIX}}'
 
     # Email server smtp settings are in config/initializers/smtp_settings.rb.sample
 
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index ec8940b7..95421c9b 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -186,6 +186,7 @@ SMTP_ENABLED=${SMTP_ENABLED:-false}
 GITLAB_EMAIL_ENABLED=${GITLAB_EMAIL_ENABLED:-${SMTP_ENABLED}}
 GITLAB_EMAIL=${GITLAB_EMAIL:-${SMTP_USER}}
 GITLAB_EMAIL_REPLY_TO=${GITLAB_EMAIL_REPLY_TO:-${GITLAB_EMAIL}}
+GITLAB_EMAIL_SUBJECT_SUFFIX=${GITLAB_EMAIL_SUBJECT_SUFFIX:-}
 GITLAB_EMAIL=${GITLAB_EMAIL:-example@example.com}
 GITLAB_EMAIL_REPLY_TO=${GITLAB_EMAIL_REPLY_TO:-noreply@example.com}
 GITLAB_EMAIL_DISPLAY_NAME=${GITLAB_EMAIL_DISPLAY_NAME:-GitLab}
diff --git a/assets/runtime/functions b/assets/runtime/functions
index ac2bab4c..1145bd67 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -359,7 +359,8 @@ gitlab_configure_mail_delivery() {
     GITLAB_EMAIL_ENABLED \
     GITLAB_EMAIL \
     GITLAB_EMAIL_DISPLAY_NAME \
-    GITLAB_EMAIL_REPLY_TO
+    GITLAB_EMAIL_REPLY_TO \
+    GITLAB_EMAIL_SUBJECT_SUFFIX
 }
 
 gitlab_configure_mailroom() {