Add user_id to expanded_params if missing from params, and if user is available.
Merge branch 'master' into bootstrap3