Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/extras/liquid_view.rb
	lib/liquid/context.rb
	lib/liquid/file_system.rb
	lib/liquid/tags/include.rb