Merge branch 'android' of git.nikiroo.be:git/fanfix into android
authorNiki Roo <niki@nikiroo.be>
Tue, 9 Apr 2019 06:30:15 +0000 (08:30 +0200)
committerNiki Roo <niki@nikiroo.be>
Tue, 9 Apr 2019 06:30:15 +0000 (08:30 +0200)

Trivial merge