Merge branch 'master' into martin-t/globals
authorMartin Taibr <taibr.martin@gmail.com>
Wed, 28 Nov 2018 14:02:09 +0000 (15:02 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Wed, 28 Nov 2018 14:02:09 +0000 (15:02 +0100)

Trivial merge