#7 - Initial library scan being cancelled
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser