6.2.4
Merge branch 'modeling-users'

Conflicts:
	spec/models/user_spec.rb