SetCalculatedFields should run on GetID always, even if retrieved from cache.
Merge branch 'master' into release/2.1b1
Fix dispatcher so that RESTRICT ONCE stack items are popped off correctly.
Note: Remove this in 2.2
Fix dispatcher so that RESTRICT ONCE stack items are properly consumed.
Merge branch 'master' into release/2.1b1

Conflicts:
	library/core/class.dispatcher.php