Merge branch 'web'
authorgregor herrmann <gregor@toastfreeware.priv.at>
Thu, 22 Nov 2018 23:34:23 +0000 (00:34 +0100)
committergregor herrmann <gregor@toastfreeware.priv.at>
Thu, 22 Nov 2018 23:34:23 +0000 (00:34 +0100)

Trivial merge