Merge remote-stream branch upstream/master

video-js-swf v4.4.1 local
Merge branch 'master' of github.com:aldricdacast/video-js-swf
Merge branch 'master' of github.com:aldricdacast/video-js-swf

Conflicts:
	src/VideoJS.as