Merge branch '3.7-stable' into this branch

.travis.yml

@@ -31,7 +31,7 @@ branches:
   only:
     - master
     - themes
-    - /*-stable/
+    - /.*-stable/
 
 notifications:
   slack:

appveyor.yml

@@ -6,6 +6,7 @@ branches:
   only:
     - master
     - themes
+    - /.*-stable/
 
 build: off
 

features/step_definitions.rb

@@ -216,8 +216,6 @@ end
 
 When(%r!^I decide to build the theme gem$!) do
   Dir.chdir(Paths.theme_gem_dir)
-  gemspec = "my-cool-theme.gemspec"
-  File.write(gemspec, File.read(gemspec).sub("TODO: ", ""))
   File.new("_includes/blank.html", "w")
   File.new("_sass/blank.scss", "w")
   File.new("assets/blank.scss", "w")

features/theme_gem.feature

@@ -17,7 +17,7 @@ Feature: Building Theme Gems
     Then the "assets/blank.scss" file should exist
     When I run git add .
     Then I should get an updated git index
-    When I run gem build my-cool-theme.gemspec
+    When I run gem build --force my-cool-theme.gemspec
     Then the "./my-cool-theme-0.1.0.gem" file should exist
     When I run gem unpack my-cool-theme-0.1.0.gem
     Then the my-cool-theme-0.1.0 directory should exist