rails 4 support
Merge branch 'master' into 2-1-stable