More fixes.
Merge branch 'master' into public

Conflicts:
	cron.php
Added context restriction.
Merge branch 'master' into public
Removed context added in previous merge.
More fixes.
Merge branch 'master' into public