Merge branch 'master' into truffle-head

Author: chrisseaton

spec/truffle/tags/language/predefined/data_tags.txt

@@ -9,3 +9,4 @@ slow:The DATA constant is included in an otherwise empty file
 windows:The DATA constant exists when the main script contains __END__
 windows:The DATA constant does not exist when the main script contains no __END__
 windows:The DATA constant does not change when an included files also has a __END__
+fails:The DATA constant exists when the main script contains __END__