[skip ci] Merge branch 'master' into dev avoiding package.json
[skip ci] Merge branch 'master' into dev avoiding package.json

streamroot/videojs5-dashjs-p2p-source-handler,streamroot/videojs5-dashjs-p2p-source-handler