Rails 4 deprecated find_by fix
Merge remote-tracking branch 'zircon/rails_4_find_by_fix' into rails41