Merge branch 'master' into martin-t/globals
authorMartin Taibr <taibr.martin@gmail.com>
Fri, 16 Nov 2018 10:00:17 +0000 (11:00 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Fri, 16 Nov 2018 10:00:17 +0000 (11:00 +0100)

Trivial merge