Merge pull request #2 from MediaBrowser/master

sync with mb