Merge branch 'master' into number_and_url_validation

assets/javascripts/wizard-custom.js

@@ -29,6 +29,7 @@
 //= require discourse/lib/intercept-click
 //= require discourse/lib/show-modal
 //= require discourse/lib/key-value-store
+//= require discourse/lib/settings
 
 //= require discourse/mixins/singleton
 
@@ -43,6 +44,7 @@
 //= require discourse/models/trust-level
 //= require discourse/models/store
 //= require discourse/models/result-set
+//= require discourse/models/bookmark
 //= require discourse/models/user
 //= require discourse/models/user-stream
 //= require discourse/models/user-action

lib/custom_wizard/builder.rb

@@ -417,7 +417,7 @@ class CustomWizard::Builder
                 end
               end
             else
-              value = [*value] + tags if key === 'tags'
+              value = [*value] + [*tags] if key === 'tags'
               params[key.to_sym] = value
             end
           end