Merge branch 'master' into android
authorNiki Roo <niki@nikiroo.be>
Fri, 5 Apr 2019 18:10:52 +0000 (20:10 +0200)
committerNiki Roo <niki@nikiroo.be>
Fri, 5 Apr 2019 18:10:52 +0000 (20:10 +0200)

Trivial merge