Merge remote-tracking branch 'upstream/user' into user
User activity custom
Merge pull request #644 from sexnothing/user

User activity custom