Re-applying earlier fix
Merge branch 'rails4'