Merge branch 'altosdroid'