Merge "Allow patrol of uploads"

diff --cc includes/DefaultSettings.php
Simple merge

diff --cc includes/changes/ChangesList.php
Simple merge

diff --cc includes/changes/RecentChange.php
Simple merge

diff --cc includes/user/User.php
Simple merge

diff --cc languages/i18n/en.json
Simple merge

diff --cc languages/i18n/qqq.json
Simple merge