Nope. you're wrong.

After I changed to:

    self.site.file_read_opts.merge(opts)

Then, on test:

    Error reading file /Users/shigeya/git/jekyll/test/fixtures/broken_front_matter1.erb: undefined method `file_read_opts' for nil:NilClass

please merge as is.