merge upstream

https://github.com/LiuLang/kwplayer-packages/commit/b12eca0d44cb68fa7fc05ebde3fdbc004ceab3f7
https://github.com/LiuLang/kwplayer-packages/commit/9db8706a2587bea548ce8f1b6c51b19e7f786d81
https://github.com/LiuLang/kwplayer-packages/commit/101d7a4aa58aa48641d2cb7057e7f52988a4374f