.
Merge remote-tracking branch 'origin/Framework' into Framework
Merge remote-tracking branch 'origin/Framework' into Framework

Conflicts:
	framework/components/collection.inc
.