Merge remote-tracking branch 'origin/weblate'
Merge remote-tracking branch 'origin/weblate'
Merge remote-tracking branch 'origin/weblate'
Merge remote-tracking branch 'origin/weblate'
privacy and terms url
Merge branch 'master' into weblate

Conflicts:
	ar_SA/LC_MESSAGES/django.mo
	ar_SA/LC_MESSAGES/django.po