fix bridges tests
Merge branch 'master' into rails4