Merge pull request #2584 from lewurm/fix-mobile-compilation