Error updating to 8.11

While updating today to latest version our gitlab broke.

Using ubuntu Ubuntu 16.04.1 LTS 64bit, updating from repo

Below is from attempting to reconfigure, apt-get update failed with same message

username@ubuntu:~$ sudo gitlab-ctl reconfigure
Starting Chef Client, version 12.12.15
resolving cookbooks for run list: ["gitlab"]
Synchronizing Cookbooks:
  - runit (0.14.2)
  - package (0.0.0)
  - gitlab (0.0.1)
Installing Cookbook Gems:
Compiling Cookbooks...
Recipe: gitlab::default
  * directory[/etc/gitlab] action create (up to date)

  ================================================================================
  Recipe Compile Error in /opt/gitlab/embedded/cookbooks/cache/cookbooks/gitlab/recipes/default.rb
  ================================================================================

  NoMethodError
  -------------
  undefined method `merge!' for nil:NilClass

  Cookbook Trace:
  ---------------
    /opt/gitlab/embedded/cookbooks/cache/cookbooks/gitlab/libraries/helper.rb:275:in `write_to_gitlab_secrets'
    /opt/gitlab/embedded/cookbooks/cache/cookbooks/gitlab/libraries/gitlab.rb:136:in `generate_secrets'
    /opt/gitlab/embedded/cookbooks/cache/cookbooks/gitlab/libraries/gitlab.rb:188:in `generate_config'
    /opt/gitlab/embedded/cookbooks/cache/cookbooks/gitlab/recipes/default.rb:37:in `from_file'

  Relevant File Content:
  ----------------------
  /opt/gitlab/embedded/cookbooks/cache/cookbooks/gitlab/libraries/helper.rb:

  268:        ci_auth = {
  269:                    'gitlab_server' => {
  270:                      'url' => Gitlab['gitlab_ci']['gitlab_server']['url'],
  271:                      'app_id' => Gitlab['gitlab_ci']['gitlab_server']['app_id'],
  272:                      'app_secret' => Gitlab['gitlab_ci']['gitlab_server']['app_secret']
  273:                    }
  274:                  }
  275>>       secret_tokens['gitlab_ci'].merge!(ci_auth)
  276:      end
  277:
  278:      if Gitlab['mattermost']['gitlab_enable']
  279:        gitlab_oauth = {
  280:                          'gitlab_enable' => Gitlab['mattermost']['gitlab_enable'],
  281:                          'gitlab_secret' => Gitlab['mattermost']['gitlab_secret'],
  282:                          'gitlab_id' => Gitlab['mattermost']['gitlab_id'],
  283:                          'gitlab_scope' => Gitlab['mattermost']['gitlab_scope'],
  284:                          'gitlab_auth_endpoint' => Gitlab['mattermost']['gitlab_auth_endpoint'],

  Platform:
  ---------
  x86_64-linux


  Running handlers:
  Running handlers complete
  Chef Client failed. 0 resources updated in 03 seconds