Refactoring ShumwayStreamConverter (see bug 924571)
Merge pull request #833 from yurydelendik/bug924571

Refactoring ShumwayStreamConverter (see bug 924571)