fixed but not setting user in session after profile update
Merge branch 'upstream/master'