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

streamroot/dashjs-p2p-wrapper,streamroot/dashjs-p2p-wrapper,streamroot/dashjs-p2p-wrapper