Merge branch 'master' into android
authorNiki Roo <niki@nikiroo.be>
Tue, 9 Apr 2019 06:27:08 +0000 (08:27 +0200)
committerNiki Roo <niki@nikiroo.be>
Tue, 9 Apr 2019 06:27:08 +0000 (08:27 +0200)

Trivial merge