Merge pull request #2779 from jow-/crtmpserver-fix