avalonmediasystem/avalon — pull request #330 by mbklein (2014-06-11 23:47:44+00:00)
Title: Feature/vov 2757

Merging into develop instead of master