Merge remote-tracking branch 'runelite/master' into ihategitandihatethisihatemergingupstream

http-service/src/main/java/net/runelite/http/service/chat/ChatController.java

@@ -100,4 +100,4 @@ public class ChatController
 	{
 		return chatService.getHosts(world, location);
 	}
-}
+}

http-service/src/main/java/net/runelite/http/service/chat/ChatService.java

@@ -117,4 +117,4 @@ public class ChatService
 			jedis.lrem(key, 0, json);
 		}
 	}
-}
+}