VLC 2.1.5
Merge pull request #5526 from ahbeng/vlc-2.1.5

VLC 2.1.5