additional fixes for #305
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser