Merge branch 'master' into gh-pages
update tech order setting for videojs 4.0 for firefox flash fallback, fixes #58