Merge pull request #956 from MediaBrowser/dev

3.0.5464.40000
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
sync updates