Merge branch 'ip_autologin' into merge1
Merge branch 'taskversions' into merge1

Conflicts:
	cms/db/UpdateDB.py
Merge branch 'debian' into merge1
Merge branch '1.0fixes' into merge1
AWS: Improve performance of rankings page.
Merge branch 'debian' into merge1