Merge branch 'master' into martin-t/linkexplode
authorMartin Taibr <taibr.martin@gmail.com>
Tue, 14 Jan 2020 13:01:21 +0000 (14:01 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Tue, 14 Jan 2020 13:01:21 +0000 (14:01 +0100)

Trivial merge