Fixed resize fragment errors
Conflict resolution with upstream

Merge branch 'master' into unified-structure

Conflicts:
	modules/std/core.php