Made video resize compatible with newer core versions.
Merge branch 'master' into api-1.1

Conflicts:
	scripts/interactive-video.js
Merge branch 'api-1.1' into api-1.2

Conflicts:
	scripts/interactive-video.js