Fixed problem after downgrading from Rails 4.1 to 4.0
Merge remote-tracking branch 'origin/master'