allow rails 4 failures
Merge branch 'master' into smart-text