Merge branch 'json-stylesheets'
authorThomas White <taw@bitwiz.me.uk>
Sat, 27 Oct 2018 22:03:51 +0000 (00:03 +0200)
committerThomas White <taw@bitwiz.me.uk>
Sat, 27 Oct 2018 22:03:51 +0000 (00:03 +0200)

Trivial merge