diff --git a/.travis.yml b/.travis.yml
index b29c502d..87e1662c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
 rvm:
-  - 1.8.7
   - 1.9.3
   - 2.0.0
   - jruby-19mode
diff --git a/Gemfile b/Gemfile
index f2f42815..0cd467f7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,17 +19,11 @@ gem "liquid", :require => false
 gem "less", "~> 2.3.0", :require => false
 gem "stylus", :require => false
 
-# gem "pry", :require => false
-# gem "pry-debugger", :require => false
-
 platforms :ruby do
   gem "therubyracer"
-  gem "redcarpet", /^1\.8/.match(RUBY_VERSION) ? "~> 2.0" : "~> 3.0"
-end
-
-# Cross-templating language block fix for Ruby 1.8
-platforms :mri_18 do
-  gem "ruby18_source_location"
+  gem "redcarpet", "~> 3.0"
+  gem "pry", :require => false
+  gem "pry-debugger", :require => false
 end
 
 platforms :jruby do
diff --git a/gem_rake_helper.rb b/gem_rake_helper.rb
index 109cb0c6..de2d91a4 100644
--- a/gem_rake_helper.rb
+++ b/gem_rake_helper.rb
@@ -19,7 +19,6 @@ require 'cucumber/rake/task'
 Cucumber::Rake::Task.new do |t|
   exempt_tags = ["--tags ~@wip"]
   exempt_tags << "--tags ~@nojava" if RUBY_PLATFORM == "java"
-  exempt_tags << "--tags ~@no18" if RUBY_VERSION < "1.9"
   exempt_tags << "--tags ~@encoding" unless Object.const_defined?(:Encoding)
   exempt_tags << "--tags ~@travishatesme" if ENV["TRAVIS"] == "true"
 
diff --git a/middleman-core/features/markdown_kramdown.feature b/middleman-core/features/markdown_kramdown.feature
index 097fc4b9..898e12b2 100644
--- a/middleman-core/features/markdown_kramdown.feature
+++ b/middleman-core/features/markdown_kramdown.feature
@@ -1,7 +1,6 @@
 Feature: Markdown (Kramdown) support
   In order to test included Kramdown support
 
-  @no18
   Scenario: Kramdown smartypants extension
     Given a fixture app "markdown-app"
     And a file named "config.rb" with:
diff --git a/middleman-core/features/markdown_redcarpet.feature b/middleman-core/features/markdown_redcarpet.feature
index 850daab0..39acc839 100644
--- a/middleman-core/features/markdown_redcarpet.feature
+++ b/middleman-core/features/markdown_redcarpet.feature
@@ -34,8 +34,9 @@ Feature: Markdown (Redcarpet) support
     Then I should see "<sup>"
     When I go to "/lax_spacing.html"
     Then I should see "<p>hello</p>"
+    When I go to "/mailto.html"
+    Then I should see '<h1>✉ <a href="mailto:mail@mail.com">Mail</a></h1>'
 
-  @no18
   Scenario: Redcarpet 3 extensions
     Given a fixture app "markdown-app"
     And a file named "config.rb" with:
diff --git a/middleman-core/fixtures/markdown-app/source/mailto.html.markdown b/middleman-core/fixtures/markdown-app/source/mailto.html.markdown
new file mode 100644
index 00000000..76f2d9f6
--- /dev/null
+++ b/middleman-core/fixtures/markdown-app/source/mailto.html.markdown
@@ -0,0 +1 @@
+# ✉ [Mail](mailto:mail@mail.com)
\ No newline at end of file
diff --git a/middleman-core/fixtures/page-classes-app/source/1-folder/1-inside-with-numeric.html.erb b/middleman-core/fixtures/page-classes-app/source/1-folder/1-inside-with-numeric.html.erb
new file mode 100644
index 00000000..02cb5c95
--- /dev/null
+++ b/middleman-core/fixtures/page-classes-app/source/1-folder/1-inside-with-numeric.html.erb
@@ -0,0 +1 @@
+<%= page_classes %>
\ No newline at end of file
diff --git a/middleman-core/fixtures/page-classes-app/source/1-starts-with-numeric.html.erb b/middleman-core/fixtures/page-classes-app/source/1-starts-with-numeric.html.erb
new file mode 100644
index 00000000..02cb5c95
--- /dev/null
+++ b/middleman-core/fixtures/page-classes-app/source/1-starts-with-numeric.html.erb
@@ -0,0 +1 @@
+<%= page_classes %>
\ No newline at end of file
diff --git a/middleman-core/fixtures/page-classes-app/source/2-starts-with-numeric-custom.html.erb b/middleman-core/fixtures/page-classes-app/source/2-starts-with-numeric-custom.html.erb
new file mode 100644
index 00000000..63ce41f8
--- /dev/null
+++ b/middleman-core/fixtures/page-classes-app/source/2-starts-with-numeric-custom.html.erb
@@ -0,0 +1 @@
+<%= page_classes :numeric_prefix => "haaaaay" %>
\ No newline at end of file
diff --git a/middleman-core/lib/middleman-core/templates/empty/Gemfile.tt b/middleman-core/lib/middleman-core/templates/empty/Gemfile.tt
index f78d3f5b..6d51559a 100644
--- a/middleman-core/lib/middleman-core/templates/empty/Gemfile.tt
+++ b/middleman-core/lib/middleman-core/templates/empty/Gemfile.tt
@@ -3,9 +3,4 @@ source 'https://rubygems.org'
 gem "middleman", "~><%= Middleman::VERSION %>"
 
 # For faster file watcher updates on Windows:
-gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw]
-
-# Cross-templating language block fix for Ruby 1.8
-platforms :mri_18 do
-  gem "ruby18_source_location"
-end
\ No newline at end of file
+gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw]
\ No newline at end of file
diff --git a/middleman-core/lib/middleman-core/templates/shared/Gemfile.tt b/middleman-core/lib/middleman-core/templates/shared/Gemfile.tt
index 39cb9cb8..5bc18919 100644
--- a/middleman-core/lib/middleman-core/templates/shared/Gemfile.tt
+++ b/middleman-core/lib/middleman-core/templates/shared/Gemfile.tt
@@ -8,9 +8,4 @@ gem "middleman", "~><%= Middleman::VERSION %>"
 gem "middleman-livereload", "~> 3.1.0"
 
 # For faster file watcher updates on Windows:
-gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw]
-
-# Cross-templating language block fix for Ruby 1.8
-platforms :mri_18 do
-  gem "ruby18_source_location"
-end
\ No newline at end of file
+gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw]
\ No newline at end of file
diff --git a/middleman-core/lib/middleman-more/core_extensions/default_helpers.rb b/middleman-core/lib/middleman-more/core_extensions/default_helpers.rb
index 39121d84..fd9da3b1 100644
--- a/middleman-core/lib/middleman-more/core_extensions/default_helpers.rb
+++ b/middleman-core/lib/middleman-more/core_extensions/default_helpers.rb
@@ -1,14 +1,3 @@
-# Required to hack around Padrino blocks within different template types.
-require 'rbconfig'
-if RUBY_VERSION =~ /1.8/ && RbConfig::CONFIG['ruby_install_name'] == 'ruby'
-  begin
-    require 'ruby18_source_location'
-  rescue LoadError
-    $stderr.puts "Ruby 1.8 requires the 'ruby18_source_location' gem be added to your Gemfile"
-    exit(1)
-  end
-end
-
 if !defined?(::Padrino::Helpers)
   require 'vendored-middleman-deps/padrino-core-0.11.2/lib/padrino-core/support_lite'
   require 'vendored-middleman-deps/padrino-helpers-0.11.2/lib/padrino-helpers'