Merge develop into 201820_-_fix_mod_redir
authorrabuzarus <trebor@central-unit>
Thu, 21 Jun 2018 20:38:15 +0000 (22:38 +0200)
committerrabuzarus <trebor@central-unit>
Thu, 21 Jun 2018 20:38:15 +0000 (22:38 +0200)

Trivial merge