Merge branch 'json-support'
authorAlexander Popov <alex.popov@linux.com>
Mon, 24 Jun 2019 11:04:11 +0000 (14:04 +0300)
committerAlexander Popov <alex.popov@linux.com>
Mon, 24 Jun 2019 11:04:11 +0000 (14:04 +0300)
Thanks to @adrianopol


Trivial merge