Merge branch 'master' into develop

Conflicts:
	src/models/player.audio.video.osmf.js