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

Conflicts:
	MediaBrowser.Controller/Providers/FanartBaseProvider.cs
	MediaBrowser.Controller/Providers/Music/LastfmArtistProvider.cs

1 files changed, 0 insertions, 4 deletions

diff --git a/MediaBrowser.Api/UserService.cs b/MediaBrowser.Api/UserService.cs
index 730242063..d4442ff44 100644
--- a/MediaBrowser.Api/UserService.cs
+++ b/MediaBrowser.Api/UserService.cs
@@ -181,8 +181,6 @@ namespace MediaBrowser.Api
         /// <returns>System.Object.</returns>
         public object Get(GetUsers request)
         {
-            var kernel = (Kernel)Kernel;
-
             var dtoBuilder = new DtoBuilder(Logger);
 
             var result = _userManager.Users.OrderBy(u => u.Name).Select(dtoBuilder.GetDtoUser).ToList();
@@ -312,8 +310,6 @@ namespace MediaBrowser.Api
         /// <returns>System.Object.</returns>
         public object Post(CreateUser request)
         {
-            var kernel = (Kernel)Kernel;
-
             var dtoUser = _jsonSerializer.DeserializeFromStream<UserDto>(request.RequestStream);
 
             var newUser = _userManager.CreateUser(dtoUser.Name).Result;