Merge branch 'web' into owm
authorgregor herrmann <gregor@toastfreeware.priv.at>
Sun, 10 Jun 2018 00:10:23 +0000 (02:10 +0200)
committergregor herrmann <gregor@toastfreeware.priv.at>
Sun, 10 Jun 2018 00:10:23 +0000 (02:10 +0200)

Trivial merge