Merged with master
Merged with stash
Editing user.rb