fix 1 query, when there is a user already on stash.user_obj. maybe another queries must be fixed also
Merge branch 'master' into production