Merge branch 'devel' of github.com:nim-lang/Nim into devel

lib/pure/json.nim

@@ -53,6 +53,9 @@
 import
   hashes, tables, strutils, lexbase, streams, unicode, macros
 
+export
+  tables.`$`
+
 type
   JsonEventKind* = enum  ## enumeration of all events that may occur when parsing
     jsonError,           ## an error occurred during parsing

lib/pure/times.nim

@@ -635,7 +635,7 @@ elif defined(JS):
 
   proc toSeconds(time: Time): float = result = time.getTime() / 1000
 
-  proc getTimezone(): int = result = newDate().getTimezoneOffset()
+  proc getTimezone(): int = result = newDate().getTimezoneOffset() * 60
 
   proc epochTime*(): float {.tags: [TimeEffect].} = newDate().toSeconds()