VLC 2.1.2
Merge pull request #2033 from ahbeng/vlc

VLC 2.1.2