Merge remote-tracking branch 'origin/v3-stable'

Conflicts:
	CHANGELOG.md
	middleman-core/lib/middleman-core/core_extensions/rendering.rb
	middleman-core/lib/middleman-core/version.rb

CHANGELOG.md

@@ -21,6 +21,15 @@ master
 * Remove old module-style extension support
 * Placed all `config.rb` evaluation inside the `ConfigContext` class
 
+3.3.3
+===
+
+* Fix thread-safety issue #501 which could cause excepts when livereloading.
+* Update to support Hooks 0.4.x dep.
+* Update to support Padrino 0.12.2+ dep.
+* Fix `after_render` manipulation of content. #1278
+* Fix combo of compass-import-once and sass-globs. middleman/middleman-sprockets#56
+
 3.3.0-3.3.2
 ===
 

README.md

@@ -89,6 +89,22 @@ The best way to get quick responses to your issues and swift fixes to your bugs
 
 [Click here to lend your support to Middleman](https://spacebox.io/s/4dXbHBorC3)
 
+## Versioning
+
+This library aims to adhere to [Semantic Versioning 2.0.0][semver]. Violations
+of this scheme should be reported as bugs. Specifically, if a minor or patch
+version is released that breaks backward compatibility, that version should be
+immediately yanked and/or a new version should be immediately released that
+restores compatibility. Breaking changes to the public API will only be
+introduced with new major versions. As a result of this policy, you can (and
+should) specify a dependency on this gem using the [Pessimistic Version
+Constraint][pvc] with two digits of precision. For example:
+
+    spec.add_dependency 'middleman-core', '~> 3.0'
+
+[semver]: http://semver.org/
+[pvc]: http://docs.rubygems.org/read/chapter/16#page74
+
 ## License
 
 Copyright (c) 2010-2014 Thomas Reynolds. MIT Licensed, see [LICENSE] for details.

middleman-core/spec/middleman-core/binary_spec.rb

@@ -3,13 +3,13 @@ require 'middleman-core/util'
 describe "Middleman::Util#binary?" do
   %w(plain.txt unicode.txt unicode).each do |file|
     it "recognizes #{file} as not binary" do
-      Middleman::Util.binary?(File.join(File.dirname(__FILE__), "binary_spec/#{file}")).should be_false
+      expect(Middleman::Util.binary?(File.join(File.dirname(__FILE__), "binary_spec/#{file}"))).to be_false
     end
   end
 
   %w(middleman.png middleman stars.svgz).each do |file|
     it "recognizes #{file} as binary" do
-      Middleman::Util.binary?(File.join(File.dirname(__FILE__), "binary_spec/#{file}")).should be_true
+      expect(Middleman::Util.binary?(File.join(File.dirname(__FILE__), "binary_spec/#{file}"))).to be_true
     end
   end
 end