Merge remote-tracking branch 'origin/dev' into dev

pages/_plugins/jekyll-example.rb

@@ -29,7 +29,7 @@ module Jekyll
   class ExampleBlock < Liquid::Block
     include Liquid::StandardFilters
 
-    SYNTAX = /^([a-zA-Z0-9.+#-]+)((\s+[\w-]+(=((\w|[0-9_-])+|"([0-9]+\s)*[0-9]+"))?)*)$/
+    SYNTAX = /^([a-zA-Z0-9.+#-]+)((\s+[\w-]+(=((\w|[0-9_-])+|"(\w|[0-9_-]|\s)+"))?)*)$/
 
     def initialize(tag_name, markup, tokens)
       super
@@ -47,7 +47,6 @@ module Jekyll
             # If a quoted list, convert to array
             if value && value.include?("\"")
               value.gsub!(/"/, "")
-              value = value.split
             end
             @options[key.to_sym] = value || true
           end