Merge branch 'android' of git.nikiroo.be:git/fanfix into android