rebase to upstream
Merge branch 'master' of https://github.com/gaetancollaud/locomote-video-player