Code

Merged branch 'json'.
authorSebastian Harl <sh@tokkee.org>
Sun, 11 Dec 2016 16:42:18 +0000 (17:42 +0100)
committerSebastian Harl <sh@tokkee.org>
Sun, 11 Dec 2016 16:42:18 +0000 (17:42 +0100)

Trivial merge