Support both the `_render_option_json` and the newer `_render_with_renderer_json` methods
Remove usage of %i
Merge pull request #655 from wouterw/ww-rails-4.2.0

Fix Rails Master