Merge remote-tracking branch 'upstream/master'

	modified:   app/controllers/users_controller.rb
	modified:   app/models/user.rb