user moderation support
Merge remote-tracking branch 'origin/4.5'
Merge remote-tracking branch 'origin/master'