First shot at the VLC Players and watchers
Merge remote-tracking branch 'origin/master'