Updating your repository

I'm updating your repository with the last changes in the rails/strong_parameters repo.

That way your pull request https://github.com/rails/strong_parameters/pull/20 can be merged.