Merged 0.2.9.10 into fdroid branch