Updated from VOV-2582 branch
Merge pull request #1 from avalonmediasystem/bugfix/VOV-2582

Updated from VOV-2582 branch