rails 4
rails 4
Merging lucascarvalho and SecretAgents forks